From b9f44ce34522b36c307696823c613dec57e8d4b5 Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Sat, 24 Feb 2018 16:26:47 -0500 Subject: [PATCH] formatting --- src/cargo/core/resolver/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index e9ff5de85..de1c7b142 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -569,6 +569,7 @@ impl RemainingCandidates { // When we are done we return the set of previously activated // that conflicted with the ones we tried. If any of these change // then we would have considered different candidates. + use std::mem::replace; for (_, b) in self.remaining.by_ref() { if let Some(a) = prev_active .iter() @@ -579,11 +580,11 @@ impl RemainingCandidates { continue; } } - if let Some(r) = ::std::mem::replace(&mut self.has_another, Some(b)) { + if let Some(r) = replace(&mut self.has_another, Some(b)) { return Ok((r, true)); } } - ::std::mem::replace(&mut self.has_another, None) + replace(&mut self.has_another, None) .map(|r| (r, false)) .ok_or_else(|| self.conflicting_prev_active.clone()) } -- 2.30.2